merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 6 May 2010 15:30:24 +0000 (00:30 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 6 May 2010 15:30:24 +0000 (00:30 +0900)
commit792c8e01ed986f65e221091aec4ac9d208a10af5
treec97b9711922aa1fc5c0821d154be65944a23426f
parent055b6e8a09417d2106d58ce4f87c76a1effe6446
parent7c192d64a9544f1ca5765e87c1ed59ba5c8b33b3
merge trunk